Merge from mainline.
authorTassilo Horn <tassilo@member.fsf.org>
Mon, 28 Dec 2009 19:25:38 +0000 (20:25 +0100)
committerTassilo Horn <tassilo@member.fsf.org>
Mon, 28 Dec 2009 19:25:38 +0000 (20:25 +0100)

Trivial merge